Merge "Cleanup framework-all usage"