Cleanup

https://ghc.haskell.org/trac/ghc/ticket/9594