Refactor remove entries threaded solution to RemoveEntriesService