reduced regex processing
contract resolver memory leak fix