Lower generated bad return value
Cleanup code after pipeline environment changes