8211364: Remove expired flags

Reviewed-by: dholmes, egahlin
8 files changed