remove addclass feature, we will see if needed later