Clean up on column removal
Back to username/password auth
Updated README
Added TODO item