Remove vestigial code