3.6/dev intrepid svoigt

remove boilerplate comments