Clean up and remove some old utilities.