MINOR TWEAK: Removed out of date command hierarchy classes