Code clean ups of compile warnings for unused variables and syntax errors