cleaning after merge with master