More server-side cleanups with project templates