Enhances removal of legacy data