Cleaning up metrics when a model is undeployed
Simplified control flow
Renamed resource methods
Simplified metric access