remove more stubs