clean up to allow pubdm