Cleanup and remove some cruft.