Remove unecessary injections and cllarify