Remove unused stubs