nightly.xml cleanup

Change-Id: I35224e5a06ad4af0ef93b60c518af340d12865a5