some cleaning after merging on master