Remove unused method and improve comments