Added (safe) cleanup command