remove test stubs,