small changes related to purging