Minor tidy of admin, and removed unused class