add clear-keys to correctly dissoc from component records