controller aware interface removed, and PSR-2 small fix