Remove not needed EventOrder
Update keymapping