All tests passing, clean up this mess phone_numbers