Cleanup definitions of the model operations