some good cleanup

Change-Id: I936c421faf0b15363f613941ddb4c6ca4a17849c