Finished porting to new way of implementing commands, removed old way.