Cleanup.
Changes that probably don't need to be checked in ... but I am doing it anyway.