Set cleanup required to true only after we have created the instance