Fix matcher id bug
Remove superfluous else