Remove class instantiation, unnecessary injections