remove some not needed code