more modern code removal.