OOIION-791 and other service spec cleanup