Further clean up of the admin side.