refs #4179 code cleanup