cleanup for XO integration