Code simplifications (possible due to IoC merge)