Remove old Scrambler class