Remove unused code
Do not add Container service to a constructor of a service