Renamed methods in order to be consistent
Completed cleanup of assistants that are not accessed through the assistant manager.