Remove stubs that should never be used