More federation removed. Should work by now