Removing the last root references

Get ready for more merge spam...