u8800: Update & Clean-Up