clearXXX calls added