Just some cleanup.