Yet more cleanup.