Remove and replace some address and customer validations for easier testing
Cleanup some code