Removed flexibility_penalty_factor, e_nd and efficiency