clean out dead weight

Change-Id: I1217d9e394aca990d4869d95b9ec6625e1b53cb6