Changed the default cleanup_mode to 'none'