Further install cleanup