Fixed phone codes, removed unused extra info for now.