(NOT READy) [#76253826] Cleanup

@narusemotoki Thanks for the comment :kiss: