cleaning up after merge

cleaning