remove core doc types and consolidate extension columns