Cleanup Player.java