Remove hard-coded stuff