Merge Cleanup

More cleanup