Remove XSCOPE TODO as I done it :)