removed some un-needed code