remove duplicate stuff after merge; reduce downstream diff

Change-Id: I662a8fc24f776ebf30476e6d638b22bb63d94e5a
Thanks for fixing my merge mistakes! :)