switch to stubs & clean up