Remove hard-coded variables