While we're at it, let's remove the (Optional) labels

because everything is optional!