Fix up strange edge case with two zeroes and remove unused code