More comprehensive remove and purge