Remove COLUMN macros

Not really using them yet, they're just wasting space and typing time