remove geojson
remove statics and move around old code