removed files that were removed in past, but appeared again by somehow
Merge branch 'master' into test_geocode_data