more code cleaning.   refs #3726