Clean up CommentsDb #2002

this fixed #2002