Moved commands around and removed old code comments