Revert "clean up"

This reverts commit e0b6823628d832e961a668c06b1b7e6543df76d2.
Revert "Probable "fix for tablet_ui""

This reverts commit 00d038b6f0aa35e44b17b79a92ae340d74b168a8.