Cleanups

Change-Id: Ie3ec7343bb2699ff21b75afc0abdce3249c9c34f