Lots of minor fixes

* Unused vars
* echo void
* Class calling its descendant's function

Change-Id: I5b3a370515117c1c6766eedcfd933bf0b6e4f760
Merge "Lots of minor fixes"