Revert "add missing keys, remove unused ones"

This reverts commit 6b63e4306e603ed0f115081757d4a45a9378c7b8.
add missing keys