remove stuff which break build for R17