removed unused comments/code