Cleanup of player classes