more cleanup

https://www.openstreetmap.org/user/cybercrypt/diary/8349