Remove deprecated core variables from the UI code