feat(simplify): simplify #624

Closed sibelius closed 11 months ago