Get rid off the last two .stub calls