u8800: Update and Clean Up.