Move dependancy injection to caller of service
final tidy up