Update storage to remove messages close #2