Another clean up.