Revert "- maptype / generics"

This reverts commit af6435fec6366c04a4023cef2ee2c0fcb8ad0452.