Cleanup model.js