[TASK] Remove un-needed injection
[TASK] Refactor away from setters