cxd4 - Remove some more hacks