correcting misspellings and removing dead code

Change-Id: Ic71dfc31299b1fbc10d7694e710699aa952da311
4 files changed