cleanup admin controller a bit