Bug: 35269103 Test: Removing unnecessary code. Existing tests pass. Change-Id: I1ba8572a8b3fabbf707e77b366717c9ba3069ace