Removed old class from 2.1.0 release