FIX: right cleanup for cloned-resources