More install cleanup