Re-add missing columns (include the migrations this time)
Remove invalid comments