Cleanup following code analysis