Add error handling for GTFS deletion; tidying