We have added some cleanup statements at the start of object creation