Removed unused data contracts.
Closes #21 - Support for options.match.

This is good enough for now. Closing the issue.