[TASK] Huge cleanup in Controller base class