Remove focal

Change-Id: Ib07d359d377358ce4683b4c593f17b2370e8da5d