Clean up previously overlooked deprecated variables