Rewrite some comments and remove an unused method