Follow some nice cleanup.