Add phonenumbers python lib, cleanup