remove cruft
add necessary coloumns