remove stuff which fails compile with R17