Remove compatibility for R15 and R16