clean up all srv's to use the same pattern.