PR for dev_1.0

Remove code line if no longer needed.