cleanup, logging still does not work