Remove Focal [2/2]

Change-Id: I2d724e36b20975a9d5eab047e65b9e6c56e0330a