removed old config values.
Cleaned up schema order.