Removed functions sXXX and fXXX which returned const value.
There seemed to be a corresponding functions without const.

Deleted deliver_EE1c, replaced some uses with deliver_EE1.