removing unnecissary dependencies and cleaning up hierarchy