Remove deprecated API usage
Static code analysis