Remove initial class search