CFY-872 clearned more code related to keypair config changes