[#2006] Deleted more parts related to the current column and pending state.
[#2006] Tidy up on the writing to the deprecated columns.