Cleanup of debug statements