more cleanup

Change-Id: If20dad8c9b94a3af953e03724a8698779e5275ed