cleanup towards hackage for 6.8.2