update code to remove class.