Added Self-Cleaning to commands