PoC-5 cleanups.