Clean-up modification