Fixed shadowed variable name
Commented BOM removal