Added ability to remove Cmds. Made it cleaner looking.