Remove unnecessary constants re-added from merge. Move callout seed to end (needs scripts)