Removing defined() or die