Clean up the whole protocol matcher thing