Further update to controller cleanup
Build