Revert "Initial commit for new Match classes"

This reverts commit 2c4b7c792b049ece3177b8b6fc6b6331038c5f5b.

Change-Id: I4974096c9215e8437f76c620ebba514684b49ce4
Signed-off-by: Ed Warnicke <eaw@cisco.com>