Remove Purge, Cleanup Code