[WIP] clean up

i know, that is why i did this in a separate commit, so you can leave that last commit out and merge the rest