More Setup.hs cleanup