admin api cleanup