More cleanup for the new OOP api