Minor logic adjustment to enable removal