Update for several typo fixes and

removal of unused variables/function calls