Remove deprecated variables