more unused code removal.