fixed some deprecated references to fix various commands, added remove command