LP1774008 Remove Hatch storage options