Import moved to controllers, janitorial work