some clean up & book keeping

next:
- clean up xcoh and xbrick ! they're too complex to be understood by my
future self!