clearing out more unused stuff