remove the stubbed stuff