clean up unsed comments/code