Remove Constrained OOP Refactor