--- a/client/cli/src/main/java/com/redhat/thermostat/client/cli/HostVMArguments.java	Thu May 19 18:55:05 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.cli;
-
-import com.redhat.thermostat.client.cli.internal.LocaleResources;
-import com.redhat.thermostat.common.cli.Arguments;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.shared.locale.Translate;
-import com.redhat.thermostat.storage.core.HostRef;
-import com.redhat.thermostat.storage.core.VmRef;
-
-public class HostVMArguments {
-
-    private static final Translate<LocaleResources> tr = LocaleResources.createLocalizer();
-
-    private HostRef host;
-    private VmRef vm;
-
-    public HostVMArguments(Arguments args) throws CommandException {
-        this(args, true, true);
-    }
-
-    public HostVMArguments(Arguments args, boolean hostRequired, boolean vmRequired) throws CommandException {
-        String hostId = args.getArgument(Arguments.HOST_ID_ARGUMENT);
-        String vmId = args.getArgument(VmArgument.ARGUMENT_NAME);
-        if (hostRequired && hostId == null) {
-            throw new CommandException(tr.localize(LocaleResources.HOSTID_REQUIRED));
-        } else if (hostId == null) {
-            host = null;
-        } else {
-            host = new HostRef(hostId, "dummy");
-        }
-        if (vmId == null && vmRequired) {
-            throw new CommandException(tr.localize(LocaleResources.VMID_REQUIRED));
-        } else if (vmId == null) {
-            vm = null;
-        } else {
-            vm = new VmRef(host, vmId, -1, "dummy");
-        }
-    }
-
-    public HostRef getHost() {
-        return host;
-    }
-
-    public VmRef getVM() {
-        return vm;
-    }
-}
-

--- a/common/core/src/test/java/com/redhat/thermostat/common/cli/HostVMArgumentsTest.java	Thu May 19 18:55:05 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.common.cli;
-
-public class HostVMArgumentsTest {
-
-    // TODO make a test that checks the argument parsing behaviour.
-}
-