Cleanup Input left-overs.

Clean-up some left over code from the old input list
generation and consumer management.

Bug: 80101428
Bug: 113136004
Bug: 111440400
Change-Id: Ibd9cd49eb8ab1dea180e602a9e881e312bea5a28