#34 remove ClientM