some cleanup, now even possible to clean :)