Clean up of EnavServiceHandlers - no functional changes