Remove COLUMNS hacks from cli.py
0.1.11