removed all o2. references