debug messages cleanup