removing some other stuff and adding new controllers