Removal of unncecessary class