Remove unused classes
Support matcher of Rspec 3.0