Removed retrieve() from OOP codebase
Removed s() from OOP codebase