Cleaning up NewORM code