fix dirty marker.
remove comments