Cleanup to DataManager

misc commenting out of unneeded code, adding of stubs of needed
methods, etc.