BUGFIX: Removed defunct RegExp replace