Remove internal redirect and log_if