cleanup
some debug messages are better be there