various cleaning up.