remove api 17 lines