Remove hardcoded info in location