Track these to to clear up lunch menu

Change-Id: I4e0b4b6837a8ce984585504749935ccd79c01043