removed storage logic