Remove unused code
Use a service object instead