Schema and template cleanups