Remove duplicate storage logic