Feature/dropoff cleanup