Review and cleanup some citation-related messages