Revert "cleanup, use interface for type hinting"

This reverts commit 0ff7ad23d8259588c8508f477554bcec40e7357c.