Minor fixes:

* remove unneeded module
* add some missing function type signature