cleaned up unused code
Merge pull request #1 from dreipol/cleanup

cleaned up unused code