removing hardcoded locations