removing as new class is availble