Some more logging and get rid of old keys array