Cleaned up a few commands