SMatch
Remove unneccessary opt
cleanup