removed some unused comments