Remove hard-coded path...