Various cleanup, print message for debug