[OLINGO-62] Cleanup