Remove forced storage stuff