remove more unused code