derp

Signed-off-by: Mattias Andrée <maandree@operamail.com>
m cleanup

Signed-off-by: Mattias Andrée <maandree@operamail.com>
derp

Signed-off-by: Mattias Andrée <maandree@operamail.com>
cleanup by removing old keys and inserting new values with one function

Signed-off-by: Mattias Andrée <maandree@operamail.com>