[OLINGO-317] Code clean up