Fix the cleanup command