Remove more dead code now we require GHC >= 6.12