Minor Change: - refactored some code in document reports; - remove some deprecated methods