remove some overcomplex related keys that we don't use anymore