undo @typed and convert UT to non-injection
simplify