escape curly brackets and remove unused code per #32