Switch to cabal
Clean up