clean up console output in common code