remove accidently added debug stuff
start refactoring of kitchensink