Project template cleanup

TBR