Remove unnecessful class