celp cleanups

Fixes for uninitialized and unused variables.