removed old code, re added locks in preperation for haswell