Update all str_replace blocks with new HOT syntax
Remove unused params