#172 cleanup admin.cc