Remove some dead prototyping code

Change-Id: Ib038c5aeeca3cf5ce886b7075df01cd54efa660a
Merge "Remove some dead prototyping code"