Retire 'mate in x' hack