Remove hard-coded config variables