add some info code for sonar correctness
and some code clearing