Some cleanup, refs #168