Removed remaining legacy code

Refactored handleMessage and removed legacy commented code. Removed
handleUpdateBatchId logger