Remove more unused functions