Clean-up utilities