SOme cleanup.