match implementation cleanup in progress