Removed obsolute IF #23