cleaning code -refs #2476