Remove conditionals

Since no one uses the conditionals, remove them so that {project_id} will substitute properly.