Clean up for xoxo