Updated to remove unused call to get keys.