Removed changing of StartingLocation

Removed changing of StartingLocation because of problems.