removed not needed code