Added configuration option to prevent cleanup of remote resources