further cleansing changes