cleanup warnings generated by CDT static analysis