Remove unused global declarations

Change-Id: I05a9bc5c0c0447c045714a445b0ed44f001db1dc
Merge "Remove unused global declarations"