Remove hard codes