remove unused columns
Refactor submissions tables
Minor templating cleanups