Removing validation because it broke some address stuff