fix heuristics , remove zumbi code