Add more TODOs; remove more outdated BZ-only code