Drop 2017 suffix