Incomplete work on removing deleted instances