Removing dead code found by javac.
Fixing some simple issues such as unused variable warnings.
Removing some unused parameters.
Adding back deleted lines in BlockSubstitution.
Merge pull request #13 from holtgrewe/feature/cleanup

Fixing some simple issues.