Revert "Fix Compile"

This reverts commit 584c14948035ad745fb5e247e2d2c08839c23d6b.
Revert "celox: Complete Overhaul"

This reverts commit d64c9a02841cdf93fb32f24196ce95da3cb53984.