Removed references to BASE_URL