Improve clear handling with preMove event