Remove hardcoded refs to paths