clean ups

Change-Id: I926ca22db3b23ca9e43b5e7da5814d9db067493a