diff --git a/dvc/cli.py b/dvc/cli.py
index 3e9a28af4..a00d76b22 100644
--- a/dvc/cli.py
+++ b/dvc/cli.py
@@ -805,4 +805,12 @@ def parse_args(argv=None):
                 pipeline_show_parser.error(msg)
         args.targets = ['Dvcfile']
 
+    if issubclass(args.func, CmdRun) \
+       and len(args.deps) == 0 \
+       and len(args.outs) == 0 \
+       and len(args.outs_no_cache) == 0 \
+       and len(args.command) == 0:
+        run_parser.error("Too few arguments. Specify at least one: "
+                         "'-d', '-o', '-O', 'command'.")
+
     return args
diff --git a/dvc/project.py b/dvc/project.py
index 2af02dbc3..98e58f59a 100644
--- a/dvc/project.py
+++ b/dvc/project.py
@@ -106,7 +106,6 @@ class Project(object):
 
     def _ignore(self):
         flist = [self.state.state_file,
-                 self.link_state.state_file,
                  self.lock.lock_file,
                  self.config.config_local_file,
                  self.updater.updater_file]
diff --git a/dvc/state.py b/dvc/state.py
index 634b722ca..cf813ba39 100644
--- a/dvc/state.py
+++ b/dvc/state.py
@@ -14,7 +14,6 @@ class StateDuplicateError(DvcException):
 
 class State(object):
     STATE_FILE = 'state'
-    STATE_LOCK_FILE = 'state.lock'
     STATE_TABLE = 'state'
     STATE_TABLE_LAYOUT = "inode TEXT PRIMARY KEY, " \
                          "mtime TEXT NOT NULL, " \
@@ -166,8 +165,6 @@ class State(object):
 
 
 class LinkState(State):
-    STATE_FILE = 'link.state'
-    STATE_LOCK_FILE = STATE_FILE + '.lock'
     STATE_TABLE = 'link'
     STATE_TABLE_LAYOUT = "path TEXT PRIMARY KEY, " \
                          "inode TEXT NOT NULL, " \