[OLINGO-468] Minor code clean up