Remove hard coded paths