Removed obsosete matcher usage, and redundant API functions