Clean Up for HTC Desire Z

Change-Id: I0eb931ab55b8bce1a1fb8a042de068b091e676d0