cleaned up old code in player