Removed UniqueTestIdListener amd support code.