remove unwanted logging and fix templates