eliminate dead code, formatting fixes
Merge pull request #387 from dlobo/MiscFixes

eliminate dead code, formatting fixes