Remove old federation
Merged bug25484