after heavy refactor
before heavy refactor
Major cleanup of unused types (mostly failed test types, no externals depends on them)