Revert "Put back the calls to product model"

This reverts commit ced2b5da8dda44bf2e4c610ea1a605d88c779b89.