removing not really needed code