cleaning up assistants and removing unused code that already have been migraded