A little cleaning on branch master