clean out dead weight

Change-Id: Ibde3c7278d443593912643c7cf6a2de38488e56e