Controllers Cleanup