Remove use of cross domain decorator