Delete unused variables and unused code paths.
merging code cleanup
removing obsolete code fragments - closes #100