Cleanage phase 3 - Controllers