Clean up clean/types.rs file by making the implementations follow the type declaration#89203