cleanup controllers
fix