Cleaning up some code so that we can submit to client

disabled mock locations, and enabled mock location check. Got rid of
unused pages.

I have the Version before this backed up so that if need be we can still
use that.