Modbus Class cleanup

- cleanup parameters passed to functions