DataRemover refactor