remove controller and fix stats