extractor speedups

remove useless and duplicated computations. Should be 8 times faster