Revert "Match Result and other changes"

This reverts commit c8bae84af0622b818ec9effcf7efe4b7db764050.