Bug Fix to 2.0

Super simple fixes:

+ Remove a cli command that should have been committed.
+ Fix a syntax error in the query.py cli implementation.