Remove unused stubs
Merge pull request #189 from ogarbe/1.2.x

Remove unused stubs