Remove needed code