Remove unused stubs
Merge pull request #188 from ogarbe/1.3.x

Remove unused stubs