first cleanup run, whitespace and dead code
remove unneded variable
more cleanups to the optimization code
Merge pull request #663 from hannesm/cleanups

Cleanups for dfmc-optimization