removed some comments and not needed code