bringing the masters together for sanity sake

Policy migration still needs some work. This PR removes many of the noqas that resulted from too long lines and brings policy migration up to date.