Remove Unused code
Merge pull request #40 from Eernie/improve/removeUnusedCode

Remove Unused code