Fixing cleanup command