Remove hard-coded pathes