Removed no needed code