Refactoring to use a service object where there is substantial
duplication
Removing now unneeded code