Remove extra empty string check