[NUCAPIJDO-72] Also remove from StoreManager