We are now doing basic matches (without ancillary data) well - code cleanup is good too