remove controllers, integrated them with handlers to be more pythonian