- [ ] get rid of citystzip column and be done with this nonsense (rollback workarounds)