Removing TODOs from storage.key.