Improve a comment and remove an unused attribute