Fixed duplicate cue test, and removed dead code.