Player class name no longer restricted; Cleanups