Small updates to remove this