Finaly cleanup of HTC 2.04 changes