Cleanup some code

Change-Id: I38a6c78221ab32db4185af483f5d35c0d57706fa