Local paths removed + minor fixes

Why are these here? Can they be removed if they aren't used in the code?