Added TODO to FileKeeper for future refactoring.
Fix ContentStore.deleteObjectFile to actually delete files correctly.