Removed more stubs again