More cleanup of registry policies