Remove TODO from storage.connection.