Removed storage from Master branch

So other fixes can still be done