Clean up

More specific version number
Removed dead code
Merge pull request #174 from jehope/dev

Clean up