Add support for CM-530 and no writeTimeout
simplify some code