drop defines for noexistent strings

Change-Id: Id04ca66ffd2710561571812c9185907cdfab6416