Handle the case of no curve present.
Remove hopefully unused code.
Missing correction on last commit.
Restore configuration handling.