refs #26 Clean up.