Fixing remove class