Removed some controllers and set via map
Removed some controllers and set via map