Don't implement commands as static methods.  Some cleanup (removed s3 push)