Revert "cleanup part 2"

This reverts commit 3e6ea3ee9dfd0b720fef145270a9541dc72c341e.

Conflicts:

Pointer.xcodeproj/project.xcworkspace/xcuserdata/cwwang.xcuserdatad/User
InterfaceState.xcuserstate
	TransparentWebViewAppDelegate.m