Smarter schema build method
Removing dead code
Removing unnecessary header
Minor cleanups
Formatting
Assertion cleanups
WIP
API simplification