and this whole if block can go away, as this does not get called after clean close anymore.