Remove unnecessary conditions and fix oc
Remove unused frequency tables
Merge pull request #7 from abcdjdj/elite-1.6

Remove unnecessary conditions and fix oc