[Key] Update simplify some mapping, remove unused