Ensure that stuff gets deleted to prevent errors
Merge pull request #1184 from mfalesni/ensure-stuff-gets-deleted

[WIP] Ensure that stuff gets deleted to prevent errors