removed Address class