take out more unused stuff.