Fixed stuck item cleanup