Remove old commented block
Misc: whitespace
Misc
Flatten code branch
Add error for compound columns
Remove old debug line
Add native field types and choices support