be way more explicit about whats being deleted
remove if on cleanup and fix test