Bus Shelter Cleanup

Bus Shelter Cleanup