removing some cruft

Change-Id: Ie3e7caf750c179f4ef4d8ad9bfe8ea6dfa51b960