remove more unused stuff