Removed obsolete if clause