remove more unused functions