Cleanup.
Fixed schema
Merge branch 'test' into dev