Removed unnecessary if