Removed extraneous if block