useless comments and shivs removed