Remove dead code
More place names