final __P removal commit