This block is now empty, shouldn't the IF be modified and replace the below ELSE?