Cleaning up. Refs #5525