Remove trailing S from server Name