Cleanup database-schema to make it re-runnable, and include employee info