remove type/typeval from extensions
Merge branch 'refactor_extension_typeval'

* refactor_extension_typeval:
  remove type/typeval from extensions