Remove dead code + Split MainCtrl into several ones