some code cleaning after merge