Fix oop features that call create an obj at the end of each class