Remove un-needed code