cleanup optimize #2

Closed nhymxu closed 2 years ago