CLC06 Import Cleanup Part Two

https://www.openstreetmap.org/user/Abbe98/diary/35745