Remove references to <timestamp>_int