More cleanup of admin dashboard