removing some hard-coded path references