Revert "Prepare to allow handling of multiple models"

This reverts commit ae561e4bd9c89ecaa2c9376c2f057dd86cd80fe3.