Remove code references to update and keymap