Removed code that caused static analyzer warnings.