Clean up to get back to workable state for Haskell