Removing performance trashing to JSFlow
Merge