Removed some remains of OIS