Removed PR2 features for last of PR1