cleanup more stubs