Sounds good. Removing `oop`...