remove unused model
add leaflet, trip model