BAC-753: cleanup