Code cleanup

Removed all code except for location testing.