Remove hard coded file locations