remove a bunch of stubs