Cleaning up after latest Olingo enhancement