- removed obsolete if clause