Cleanup project templates slightly