Disabled broken parts of stub, cleanup in its calling function