add comment and remove unused count