Remove helpers for Blaze implementation
Merge branch 'blaze' into steam