Clean up an XXX
WIP