optimize clearing
change version