Removed TODO from Scrambler