cleanup back to cm/stock