Remove from Core too