removing vestigial code