remove some un-needed code