extras: Cleanup

Change-Id: Iec68496105e3f0062c79d959f48863e38b21b5a1