Removed unused dependencies, minor fixes to reading code