[FIX] remove leftover code from refactoring
[FIX] take care we don't duplicate the model record in _auto_init