Cleaned up some commands.