Cleaned orm.js