master #18 clean