Revert "Updated code for service"

This reverts commit 3310f0a470859ac13ae2940c0c832a1f1798c979.