Removing deface override and putting it in shipping address gem.