Clean-up and generalizations