Remove obsolete cabal line
Compatibility with hashable-1.2
Cleanup with some new types and removing dead code