Major Major cleanup of DomeCode.