remove unnecessary controller and update exception handling