Cleaned up the extraneous notes left over from the merge conflict with simplify and master.