Removed unwanted location variables.