Tried to resolve a potential conflict in header.  Refs #7001.
Cleared all the debugging codes.  Refs #7001.