Bug 698530 - Remove any use of the sites framework

Remove any use of the sites framework