Remove depth and direction state from players (not presently used)
Fix merge conflicts