[FIX] Cleanup
[FIX] Some cleanup of flow meter