Cleanup from Coverity scan