Remove deprecated code.
Rename variables to facilitate model selection.