fix(type-safe-api): remove imports for self-referential models

fix(type-safe-api): remove imports for self-referential models #1401