Remove more unused things