Unused code removed. Noticeable gain in performance