removed implicit storage logic