[TASK] Remove inject methods and use @inject - #113