remove logging
remove extra logging
update to new key format
use new key format