Make the container final. Remove some injectables we should not be injecting.