Remove more un-needed code