Merge "Remove the Stress framework"