Breeze: RA-127 removing some duplication