Remove unnecessary oop methodology/