Can you remove all the `storage` lines, including the commented out lines?