Some cleanup; unable to duplicate move phase w/ no move points issue.