Needed to remove this class