Yet another cleanup.