Not sure if I agree with the above
From what i've read, once a NFA item, always an NFA item,
From the above link
Q: If I remove the short barrel from the registered SBR or SBS, is the receiver still subject to NFA transfer and possession regulations?
If the possessor retains control over the barrel or other parts required to assemble the SBR or SBS, the firearm would still be subject to NFA transfer and possession regulations. ATF recommends contacting State law enforcement officials to ensure compliance with state and local law.
Q: Does the installation of a barrel over 16 inches in length (SBR) or 18 inches in length (SBS) remove the firearm from the purview of the NFA? If so, is this considered a permanent change?
Installation of a barrel greater than 16 inches in length (SBR) or 18 inches in length (SBS) will remove the firearm from the purview of the NFA provided the registrant does not maintain control over the parts necessary to reconfigure the firearm as a SBR or SBS.
Seem you would have to get rid of any sub 16inch uppers