[Merge]Cleaning up after merge