Remove more unused/deprecated variables