* controllers cleanup