rm vestigial code