Correcting a 2 times parsed root directory and cleaning up a dependecy.