Should this line be here, or should it be handled by cleanupAndDelete?