Nope. You can take off the threaded-on flash hider, thread on a muzzle brake then pin it permanently and it’ll be perfectly legal. Also, just to have the pre-ban upper in your possession is fine because it is not considered the gun, like the lower is.