Cleanup of vars to recall refs #32