Removing smartmatch