I think it's okay to remove the session storage blocks since we don't ever use that. But, can we just remove the commented section?