removed dead code
moving comments around