Merged and clean from KNM