more removal of unneeded code.
Merge pull request #113 from regneq/master

more removal of unneeded code.