Improved verified flow tracking
Removed debugging constants