Got rid of not needed code