More magestore removal