More project template cleanups