Remove old P1 stuff