Remove some obsolete stubs.

Also, use the "callable" typehint where appropriate.