I'll remove them before merging.  I'm still working with Reiko (offline) to see if we can figure out what's causing her problems, so I'll wait until that's resolved before going through and removing them all.