removed no needed code