Remove stale comments and hardcoding.