Clean up the haskell build+test branch.