i925: cleanup

Change-Id: I86ddcff4cc98c131dbeeb6ebe054e00be319becc