xml comment fix and remove unused code