removed old config values.
Cleaned up schema order.
Merge branch 'test' into dev