Final cleanup on p2 before code review