cleaned up location stuff a bit. Removed some unnecessary lines.