removing more gp2 stuff