Just an FYI of this patch: gerrit:141724. It removes the Sites classes from core, since they are not used anywhere.
