Fix key, remove console logs