cleanup and fix for XTAL/2 for quanta