removing hardcoded classname