Remove some unneeded (double) stubs