removed oop