Clean up some UA integration