fixed column names, removed outdated legacy code