Another neccesary cleanup.