Revert "typeextractor stuff"

This reverts commit 9d509ab695f89875f3df7632e66126550fdd35d5.
undo type extractor stuff #2