Support Removal of Data when Instance Terminates

.. and some other fixes.