Fix bugs and remove unused column.