Remove matching system

Closes #616.