Clean-Up By Redefinition