#34 Simplification of the dependencies