Yet more clean up.