Revert "Roy|13|Added missing MessageDTO constructor"

This reverts commit 06168002bec0e227758257736ec55c199766b5e0.
Revert "|#11|Megha, Sharvani| added bookmark and refactored code."

This reverts commit cab8cf1d8f10f1c56bf79c443e5400c1fb50ce46.