Removed unused stubs