Cleaned up shipping/contact schema