Remove uneeded stubs