cleaned up ContentProvider