Controversial probate fee plans scrapped ahead of general election