More cleaning, seems a lot of else cases are forgotten... see TODO: