MOB-2777 removed if statements, checking if string is empty