Removing things that moved into gwtp