[OLINGO-418] cleanup