Remove unneed @Inject, unnecessary complicated logic