More server cleanup around project templates feature