Optiomise and remove old functions.
Remove Matches Options.