Revert "Set default service version"

This reverts commit 31348468c1f4a0f950b7107cfb5963600fe11d92.
made changes based on the code review