Modifying existing code to make use of new `CompiledModel` interface
Cleaning up some cruft