Merge "Remove the obsolete account columns from newly created db"