Remove old data binding code