Cleaned not needed code