Some further cleanup.