Data delete function is working. Merging back with master soon.