remove stubs again