Remove auto match code. Closes #2