Remove "extras" as it is not used

Change-Id: I888da20a855538dc1257602e6ccf653814d62bc6
Merge "Remove "extras" as it is not used"