Resolve code-pro violations