Post merge cleanup.
Initial commit of vopros service message.