Tidy up Commandremove a bit, thanks to Evonuts