more cleanup

https://map.bnnd.eu.org/user/cybercrypt/diary/8349