Start unhoisting functions cleanup in model.js