removed active record references and added location and trip controllers