More renaming
Get rid of secret_token_replacer - it's not used anyway