hotFix remove old class using