removed excess controllers, merged some stuff