Purger cleanup & fixes