Remove some un-needed code