* Remove PoC-1 back-compat hacks * Fix lingering Keccak references * More keccak exorcism * Fix test * Final fixes
