Removed dead code found by compiler warning

After fixing one warning about private globals
not being marked static (by marking them static)
another warning appeared saying that they are in fact
not used at all.  Just removed them.

Change-Id: Iead6576f9106ab3207f0b9452f7a6951379d8f3d
Merge topic 'fixed-defined-but-not-used' into master

8ff3310f Removed dead code found by compiler warning