Remove more unused stuff