imp ContentProvider Fragmentation, code cleanup