removing more unused stuff