More project template cleanups

TBR