refactored Deleter / removed DeleteFactory - WIP