Back porting changes to non-c++11
Removing reference to new osp structure