Add servicetag for docs. Remove unecessary code