Remove hard-coded column names