Merge "Remove old and unused stubs."